Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:12:42 +0000 (20:12 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:12:42 +0000 (20:12 +0300)
commite2727bca89d6488070f12c621d1d94956891f2fd
tree783346a9e1153dbf275a13b5a2d19dd16985a8c3
parent708c8bcbf5e46a8a991563bd00a9c94f95a64324
parentb630f2291dc26638e2865838322764848fc39f24
Merge from trunk.